From 94f556c210e16bc4df202112bee7340a0a0f99c6 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Wed, 21 Dec 2005 09:31:05 -0600 Subject: [PATCH] Support domU initrd and cmdline (previous cset also) Signed-off-by: Akio Takebe --- xen/arch/ia64/xen/domain.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index 9f868ade73..a1fc49d7bd 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -367,10 +367,13 @@ void new_thread(struct vcpu *v, regs->r28 = dom_fw_setup(d,saved_command_line,256L); else { regs->ar_rsc |= (2 << 2); /* force PL2/3 */ - //regs->r28 = dom_fw_setup(d,d->arch.cmdline,256L); -printf("construct domU: d->arch.cmdline=%p, firstchar=%d\n", -d->arch.cmdline,*(d->arch.cmdline)); - regs->r28 = dom_fw_setup(d,"nomca nosmp xencons=tty0 console=tty0 root=/dev/hda1",256L); //FIXME + if (*d->arch.cmdline == '\0') { +#define DEFAULT_CMDLINE "nomca nosmp xencons=tty0 console=tty0 root=/dev/hda1" + regs->r28 = dom_fw_setup(d,DEFAULT_CMDLINE,256L); + printf("domU command line defaulted to" + DEFAULT_CMDLINE "\n"); + } + else regs->r28 = dom_fw_setup(d,d->arch.cmdline,256L); } VCPU(v, banknum) = 1; VCPU(v, metaphysical_mode) = 1; -- 2.30.2